From beddd0c5e8489bf7ff579abd5b9fa8c65469ec51 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Jan 2006 13:50:02 +0000 Subject: [PATCH] Call gtk_drag_update for non-motion events. (#325443, Peter Harvey) 2006-01-03 Matthias Clasen * gtk/gtkdnd.c (gtk_drag_begin_internal): Call gtk_drag_update for non-motion events. (#325443, Peter Harvey) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkdnd.c | 10 ++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5565034098..ba4342ebcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-01-03 Matthias Clasen + * gtk/gtkdnd.c (gtk_drag_begin_internal): Call gtk_drag_update + for non-motion events. (#325443, Peter Harvey) + * gtk/gtkaction.c: Avoid connecting to notify on our own properties. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5565034098..ba4342ebcc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-01-03 Matthias Clasen + * gtk/gtkdnd.c (gtk_drag_begin_internal): Call gtk_drag_update + for non-motion events. (#325443, Peter Harvey) + * gtk/gtkaction.c: Avoid connecting to notify on our own properties. diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 9caa1a711a..e29e270e94 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -2220,6 +2220,8 @@ gtk_drag_begin_internal (GtkWidget *widget, if (event && event->type == GDK_MOTION_NOTIFY) gtk_drag_motion_cb (info->ipc_widget, (GdkEventMotion *)event, info); + else + gtk_drag_update (info, info->screen, info->cur_x, info->cur_y, (GdkEvent *)event); info->start_x = info->cur_x; info->start_y = info->cur_y; @@ -3746,8 +3748,12 @@ gtk_drag_update (GtkDragSourceInfo *info, info->cur_x = x_root; info->cur_y = y_root; if (info->last_event) - gdk_event_free ((GdkEvent *)info->last_event); - info->last_event = gdk_event_copy ((GdkEvent *)event); + { + gdk_event_free ((GdkEvent *)info->last_event); + info->last_event = NULL; + } + if (event) + info->last_event = gdk_event_copy ((GdkEvent *)event); gtk_drag_add_update_idle (info); } -- 2.30.2